Merge docs
authorrread@ubuntu.eng.hq.xensource.com <rread@ubuntu.eng.hq.xensource.com>
Sun, 4 Dec 2005 00:52:38 +0000 (17:52 -0700)
committerrread@ubuntu.eng.hq.xensource.com <rread@ubuntu.eng.hq.xensource.com>
Sun, 4 Dec 2005 00:52:38 +0000 (17:52 -0700)

Trivial merge